forked from space-syndicate/space-station-14-next
-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
upstream #8
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* first * fix govna * forgot about using FUCK
Co-authored-by: FN <[email protected]>
This reverts commit 25fc23c.
* Sec always watching * Убран статус "Подозревается" * Wanted and Detained
Change offer_item icon
* first * fix * fix * Apply suggestions from code review Co-authored-by: FN <[email protected]> * fix * Apply suggestions from code review * fix --------- Co-authored-by: AwareFoxy <[email protected]> Co-authored-by: FN <[email protected]>
* Fix * Delete Resources/Prototypes/_CorvaxNext/Catalog/uplink-catalog.yml * lol
* Added artificial bluespace crystals * Added transitor * Updated locale & minor fixes * Xddd * Update Content.Client/_CorvaxNext/BluespaceHarvester/BluespaceHarvesterMenu.xaml.cs Co-authored-by: FN <[email protected]> * Update Resources/Prototypes/_CorvaxNext/Entities/Structures/Power/substations.yml Co-authored-by: FN <[email protected]> * Update Content.Server/_CorvaxNext/BluespaceHarvester/BluespaceHarvesterSystem.cs Co-authored-by: FN <[email protected]> * Rename reseted to reset * Separated map count * Update BluespaceHarvesterSystem.cs --------- Co-authored-by: FN <[email protected]>
…cost Less BSH cost
NoScope 360 AWP kill
* innate mineral scanner * Update Resources/Prototypes/Entities/Mobs/Species/dwarf.yml Co-authored-by: lzk <[email protected]> * Update Dwarf.xml --------- Co-authored-by: lzk <[email protected]>
Плата мед. биофаба в шкафчике СМО
…ble_biofab Изучаемый мед. фабрикатор
* innate mineral scanner * Security Badges * Брейклайны
* FireOnDrop * whoopsy
* ExeCute * fix? * nope * fix: formatting - remove useless comments - if statement in OnSignalRecieved() should be handled in switch-case - Logger class shouldn't be used in logging, there is sawmills for this - Remove unnecessary methods * some more shit * wrong author --------- Co-authored-by: JerryImMouse <[email protected]>
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
S: Merge Conflict
size/XL
and removed
S: Merge Conflict
size/XL
labels
Dec 11, 2024
RSI Diff Bot; head commit 2662863 merging into 3eaf67c Resources/Textures/Structures/Machines/limbgrower.rsi
Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/nightvision.rsi
Resources/Textures/_CorvaxNext/Clothing/Eyes/Goggles/thermal.rsi
Resources/Textures/_CorvaxNext/Clothing/Neck/SecBadge/brigmedbadge.rsi
Resources/Textures/_CorvaxNext/Clothing/Neck/SecBadge/cadetbadge.rsi
Resources/Textures/_CorvaxNext/Clothing/Neck/SecBadge/detbadge.rsi
Resources/Textures/_CorvaxNext/Clothing/Neck/SecBadge/hosbadge.rsi
Resources/Textures/_CorvaxNext/Clothing/Neck/SecBadge/officerbadge.rsi
Resources/Textures/_CorvaxNext/Clothing/Neck/SecBadge/pilotbadge.rsi
Resources/Textures/_CorvaxNext/Clothing/Neck/SecBadge/wardenbadge.rsi
Resources/Textures/_CorvaxNext/Interface/Alerts/offer_item.rsi
Resources/Textures/_CorvaxNext/Objects/Structures/Power/bluespace_transitor.rsi
Resources/Textures/_CorvaxNext/Structures/Furniture/execution_chair.rsi
Resources/Textures/_CorvaxNext/Structures/Machines/limbgrower.rsi
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.